Refixed merge conflicts for GTK_WIDGET_MAPPED/GTK_WIDGET_VISIBLE
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Sun, 4 Apr 2010 01:35:18 +0000 (21:35 -0400)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Sun, 4 Apr 2010 01:35:18 +0000 (21:35 -0400)
commitae2c0b02c3a9023553540d4a07e6636a22ce17d6
treec77b0075a03b139fd916c8411f12d918b13a7d4f
parent5d83f5eba58a7266949c5e47fb5f3fefec10c107
Refixed merge conflicts for GTK_WIDGET_MAPPED/GTK_WIDGET_VISIBLE
gtk/gtkbox.c
gtk/gtksocket-x11.c